[linux] Remove some gratuitous differences with plain 2.6.16.33.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c b/linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c
index f491038674097bc014a37ebf500400b4295f9903..ee2f87191f9053dcf51831e2e5755441cc035b58 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/pci/irq-xen.c
@@ -110,7 +110,6 @@ static struct irq_routing_table * __init pirq_find_routing_table(void)
                if (rt)
                        return rt;
        }
-       
        return NULL;
 }
 
@@ -261,13 +260,13 @@ static int pirq_via_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i
  */
 static int pirq_via586_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
 {
-       static unsigned int pirqmap[4] = { 3, 2, 5, 1 };
+       static unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
        return read_config_nybble(router, 0x55, pirqmap[pirq-1]);
 }
 
 static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
 {
-       static unsigned int pirqmap[4] = { 3, 2, 5, 1 };
+       static unsigned int pirqmap[5] = { 3, 2, 5, 1, 1 };
        write_config_nybble(router, 0x55, pirqmap[pirq-1], irq);
        return 1;
 }

diff --git a/linux-2.6-xen-sparse/net/core/dev.c b/linux-2.6-xen-sparse/net/core/dev.c
index ef92b788f0978407b1d902aa7ea2dcf4273f01db..3065f9242d2337cccac631cf1795aad875ef8c5b 100644 (file)
--- a/linux-2.6-xen-sparse/net/core/dev.c
+++ b/linux-2.6-xen-sparse/net/core/dev.c
@@ -1248,14 +1248,13 @@ static int dev_gso_segment(struct sk_buff *skb)
        /* Verifying header integrity only. */
        if (!segs)
                return 0;
-
+  
        if (unlikely(IS_ERR(segs)))
                return PTR_ERR(segs);
 
        skb->next = segs;
        DEV_GSO_CB(skb)->destructor = skb->destructor;
        skb->destructor = dev_gso_skb_destructor;
-
        return 0;
 }